From: Roger Pau Monne Date: Fri, 22 Sep 2017 15:25:08 +0000 (+0100) Subject: libxl: remove device model "none" support from disk related functions X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1303 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=e383853419fec797acbd327b78540322e37f6d4a;p=xen.git libxl: remove device model "none" support from disk related functions CD-ROM backend selection was partially based on the device model, this is no longer needed since the device model "none" is now removed, so HVM guests always have a device model. Signed-off-by: Roger Pau Monné Acked-by: Ian Jackson --- diff --git a/tools/libxl/libxl_disk.c b/tools/libxl/libxl_disk.c index 263cb5631a..895bf4f89a 100644 --- a/tools/libxl/libxl_disk.c +++ b/tools/libxl/libxl_disk.c @@ -166,9 +166,7 @@ static int libxl__device_disk_setdefault(libxl__gc *gc, uint32_t domid, /* Force Qdisk backend for CDROM devices of guests with a device model. */ if (disk->is_cdrom != 0 && - libxl__domain_type(gc, domid) == LIBXL_DOMAIN_TYPE_HVM && - libxl__device_model_version_running(gc, domid) != - LIBXL_DEVICE_MODEL_VERSION_NONE) { + libxl__domain_type(gc, domid) == LIBXL_DOMAIN_TYPE_HVM) { if (!(disk->backend == LIBXL_DISK_BACKEND_QDISK || disk->backend == LIBXL_DISK_BACKEND_UNKNOWN)) { LOGD(ERROR, domid, "Backend for CD devices on HVM guests must be Qdisk"); @@ -717,12 +715,6 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, goto out; } - if (dm_ver == LIBXL_DEVICE_MODEL_VERSION_NONE) { - LOGD(ERROR, domid, "Guests without a device model cannot use cd-insert"); - rc = ERROR_FAIL; - goto out; - } - disks = libxl__device_list(gc, &libxl__disk_devtype, domid, &num); for (i = 0; i < num; i++) { if (disks[i].is_cdrom && !strcmp(disk->vdev, disks[i].vdev))